Merge git://git.denx.de/u-boot-video
authorTom Rini <[email protected]>
Fri, 1 Sep 2017 16:57:03 +0000 (12:57 -0400)
committerTom Rini <[email protected]>
Fri, 1 Sep 2017 16:57:03 +0000 (12:57 -0400)

Trivial merge